this function was broken if called on the first position in the buffer.

2001-01-05  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
	broken if called on the first position in the buffer.

	* gtk/gtktextlayout.c (line_display_index_to_iter): fix
	forward_to_delimiters to be called only if we aren't already at
	the delimiters.

diff --git a/ChangeLog b/ChangeLog
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ef9005fcb9eb8a0c037169c7cc940b80bdb559ad..047e768ad481be771774bbe056a68fe411f0da3d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-01-05  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was
+       broken if called on the first position in the buffer.
+
+       * gtk/gtktextlayout.c (line_display_index_to_iter): fix
+       forward_to_delimiters to be called only if we aren't already at
+       the delimiters.
+
 2001-01-05  Havoc Pennington  <hp@redhat.com>
 
        * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix.

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index c085fb32663545a1b6c1231b2b15bdb75fa92424..3dc422e2fe260a11b808b42075f5f0abe9481f6f 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -1366,7 +1366,7 @@ gtk_text_iter_ends_line (const GtkTextIter   *iter)
        */
       GtkTextIter tmp = *iter;
       if (!gtk_text_iter_backward_char (&tmp))
-        return FALSE;
+        return TRUE;
 
       return gtk_text_iter_get_char (&tmp) != '\r';
     }

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 035d4935a8cc9aaf6c12856336b37c0b42d17bf7..315dbf8d99399f8aa3c5176c8146a08a531a9769 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1954,7 +1954,9 @@ line_display_index_to_iter (GtkTextLayout      *layout,
       
       _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                         iter, display->line, 0);
-      gtk_text_iter_forward_to_delimiters (iter);
+
+      if (!gtk_text_iter_ends_line (iter))
+        gtk_text_iter_forward_to_delimiters (iter);
     }
 
   /* FIXME should this be cursor positions? */